Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 06:10:15 +0000 (23:10 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 06:10:15 +0000 (23:10 -0700)
commitdb233ba0f4cb84072dc627ac9b480dbdead78ec4
tree761910280a96ed5e5e9ffd825a934017a3ddd690
parente6affd5de5d591f7fb592ce7219c04806090b68e
parent9b45f2424eef93b3d45cdd5a81ff7748c9d4d2ac
Merge from trunk.
src/ChangeLog
src/alloc.c
src/fileio.c
src/lread.c
src/xdisp.c